Autogenerated HTML docs for v2.22.0-68-g0aae9
diff --git a/RelNotes/2.23.0.txt b/RelNotes/2.23.0.txt new file mode 100644 index 0000000..ada7f52 --- /dev/null +++ b/RelNotes/2.23.0.txt
@@ -0,0 +1,77 @@ +Git 2.23 Release Notes +====================== + +Updates since v2.22 +------------------- + +Backward compatibility note + + * The "--base" option of "format-patch" computed the patch-ids for + prerequisite patches in an unstable way, which has been updated to + compute in a way that is compatible with "git patch-id --stable". + + +UI, Workflows & Features + + * The "git fast-export/import" pair has been taught to handle commits + with log messages in encoding other than UTF-8 better. + + * In recent versions of Git, per-worktree refs are exposed in + refs/worktrees/<wtname>/ hierarchy, which means that worktree names + must be a valid refname component. The code now sanitizes the names + given to worktrees, to make sure these refs are well-formed. + + * "git merge" learned "--quit" option that cleans up the in-progress + merge while leaving the working tree and the index still in a mess. + + * "git format-patch" learns a configuration to set the default for + its --notes=<ref> option. + + * The code to show args with potential typo that cannot be + interpreted as a commit-ish has been improved. + + +Performance, Internal Implementation, Development Support etc. + + * Update supporting parts of "git rebase" to remove code that should + no longer be used. + + * Developer support to emulate unsatisfied prerequisites in tests to + ensure that the remainer of the tests still succeeds when tests + with prerequisites are skipped. + + * "git update-server-info" learned not to rewrite the file with the + same contents. + + * The way of specifying the path to find dynamic libraries at runtime + has been simplified. The old default to pass -R/path/to/dir has been + replaced with the new default to pass -Wl,-rpath,/path/to/dir, + which is the more recent GCC uses. Those who need to build with an + old GCC can still use "CC_LD_DYNPATH=-R" + + +Fixes since v2.22 +----------------- + + * A relative pathname given to "git init --template=<path> <repo>" + ought to be relative to the directory "git init" gets invoked in, + but it instead was made relative to the repository, which has been + corrected. + (merge e1df7fe43f nd/init-relative-template-fix later to maint). + + * "git worktree add" used to fail when another worktree connected to + the same repository was corrupt, which has been corrected. + (merge 105df73e71 nd/corrupt-worktrees later to maint). + + * The ownership rule for the file descriptor to fast-import remote + backend was mixed up, leading to unrelated file descriptor getting + closed, which has been fixed. + (merge 3203566a71 mh/import-transport-fd-fix later to maint). + + * A "merge -c" instruction during "git rebase --rebase-merges" should + give the user a chance to edit the log message, even when there is + otherwise no need to create a new merge and replace the existing + one (i.e. fast-forward instead), but did not. Which has been + corrected. + + * Other code cleanup, docfix, build fix, etc.
diff --git a/git-config.html b/git-config.html index b6b3eea..5f6c7fb 100644 --- a/git-config.html +++ b/git-config.html
@@ -4764,6 +4764,24 @@ </p> </dd> <dt class="hdlist1"> +format.notes +</dt> +<dd> +<p> + Provides the default value for the <code>--notes</code> option to + format-patch. Accepts a boolean value, or a ref which specifies + where to get notes. If false, format-patch defaults to + <code>--no-notes</code>. If true, format-patch defaults to <code>--notes</code>. If + set to a non-boolean value, format-patch defaults to + <code>--notes=<ref></code>, where <code>ref</code> is the non-boolean value. Defaults + to false. +</p> +<div class="paragraph"><p>If one wishes to use the ref <code>ref/notes/true</code>, please use that literal +instead.</p></div> +<div class="paragraph"><p>This configuration can be specified multiple times in order to allow +multiple notes refs to be included.</p></div> +</dd> +<dt class="hdlist1"> filter.<driver>.clean </dt> <dd>
diff --git a/git-fast-export.html b/git-fast-export.html index 4deb321..c71fbf8 100644 --- a/git-fast-export.html +++ b/git-fast-export.html
@@ -938,6 +938,18 @@ </p> </dd> <dt class="hdlist1"> +--reencode=(yes|no|abort) +</dt> +<dd> +<p> + Specify how to handle <code>encoding</code> header in commit objects. When + asking to <em>abort</em> (which is the default), this program will die + when encountering such a commit object. With <em>yes</em>, the commit + message will be reencoded into UTF-8. With <em>no</em>, the original + encoding will be preserved. +</p> +</dd> +<dt class="hdlist1"> --refspec </dt> <dd> @@ -1062,7 +1074,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-01-04 14:31:36 PST + 2019-06-13 15:06:39 PDT </div> </div> </body>
diff --git a/git-fast-export.txt b/git-fast-export.txt index 64c01ba..11427ac 100644 --- a/git-fast-export.txt +++ b/git-fast-export.txt
@@ -129,6 +129,13 @@ for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id). +--reencode=(yes|no|abort):: + Specify how to handle `encoding` header in commit objects. When + asking to 'abort' (which is the default), this program will die + when encountering such a commit object. With 'yes', the commit + message will be reencoded into UTF-8. With 'no', the original + encoding will be preserved. + --refspec:: Apply the specified refspec to each ref exported. Multiple of them can be specified.
diff --git a/git-fast-import.html b/git-fast-import.html index a6d07a9..658525b 100644 --- a/git-fast-import.html +++ b/git-fast-import.html
@@ -1286,6 +1286,7 @@ original-oid? ('author' (SP <name>)? SP LT <email> GT SP <when> LF)? 'committer' (SP <name>)? SP LT <email> GT SP <when> LF + ('encoding' SP <encoding>)? data ('from' SP <commit-ish> LF)? ('merge' SP <commit-ish> LF)? @@ -1346,6 +1347,12 @@ their syntax.</p></div> </div> <div class="sect3"> +<h4 id="_code_encoding_code"><code>encoding</code></h4> +<div class="paragraph"><p>The optional <code>encoding</code> command indicates the encoding of the commit +message. Most commits are UTF-8 and the encoding is omitted, but this +allows importing commit messages into git without first reencoding them.</p></div> +</div> +<div class="sect3"> <h4 id="_code_from_code"><code>from</code></h4> <div class="paragraph"><p>The <code>from</code> command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the @@ -2522,7 +2529,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-04-25 03:09:28 PDT + 2019-06-13 15:06:39 PDT </div> </div> </body> diff --git a/git-fast-import.txt b/git-fast-import.txt index d65cdb3..7baf9e4 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt
@@ -388,6 +388,7 @@ original-oid? ('author' (SP <name>)? SP LT <email> GT SP <when> LF)? 'committer' (SP <name>)? SP LT <email> GT SP <when> LF + ('encoding' SP <encoding>)? data ('from' SP <commit-ish> LF)? ('merge' SP <commit-ish> LF)? @@ -455,6 +456,12 @@ See ``Date Formats'' above for the set of supported formats, and their syntax. +`encoding` +^^^^^^^^^^ +The optional `encoding` command indicates the encoding of the commit +message. Most commits are UTF-8 and the encoding is omitted, but this +allows importing commit messages into git without first reencoding them. + `from` ^^^^^^ The `from` command is used to specify the commit to initialize diff --git a/git-format-patch.html b/git-format-patch.html index 0c69c8e..fad25ef 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -762,7 +762,8 @@ [--rfc] [--subject-prefix=Subject-Prefix] [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] - [--[no-]cover-letter] [--quiet] [--notes[=<ref>]] + [--[no-]cover-letter] [--quiet] + [--no-notes | --notes[=<ref>]] [--interdiff=<previous>] [--range-diff=<previous> [--creation-factor=<percent>]] [--progress] @@ -1858,6 +1859,9 @@ <dt class="hdlist1"> --notes[=<ref>] </dt> +<dt class="hdlist1"> +--no-notes +</dt> <dd> <p> Append the notes (see <a href="git-notes.html">git-notes(1)</a>) for the commit @@ -1870,6 +1874,8 @@ keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the <code>notes.rewrite</code> configuration options in <a href="git-notes.html">git-notes(1)</a> to use this workflow).</p></div> +<div class="paragraph"><p>The default is <code>--no-notes</code>, unless the <code>format.notes</code> configuration is +set.</p></div> </dd> <dt class="hdlist1"> --[no-]signature=<signature> @@ -2411,7 +2417,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-02-05 15:33:20 PST + 2019-06-13 15:06:39 PDT </div> </div> </body>
diff --git a/git-format-patch.txt b/git-format-patch.txt index 1af85d4..9ce5b8a 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt
@@ -22,7 +22,8 @@ [--rfc] [--subject-prefix=Subject-Prefix] [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] - [--[no-]cover-letter] [--quiet] [--notes[=<ref>]] + [--[no-]cover-letter] [--quiet] + [--no-notes | --notes[=<ref>]] [--interdiff=<previous>] [--range-diff=<previous> [--creation-factor=<percent>]] [--progress] @@ -263,6 +264,7 @@ for details. --notes[=<ref>]:: +--no-notes:: Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line. + @@ -273,6 +275,9 @@ keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow). ++ +The default is `--no-notes`, unless the `format.notes` configuration is +set. --[no-]signature=<signature>:: Add a signature to each message produced. Per RFC 3676 the signature
diff --git a/git-merge.html b/git-merge.html index a19f588..d603608 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -1132,6 +1132,15 @@ <code>MERGE_HEAD</code> is present.</p></div> </dd> <dt class="hdlist1"> +--quit +</dt> +<dd> +<p> + Forget about the current merge in progress. Leave the index + and the working tree as-is. +</p> +</dd> +<dt class="hdlist1"> --continue </dt> <dd> @@ -2030,7 +2039,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-04-16 05:48:13 PDT + 2019-06-13 15:06:39 PDT </div> </div> </body>
diff --git a/git-merge.txt b/git-merge.txt index 6294dbc..c01cfa6 100644 --- a/git-merge.txt +++ b/git-merge.txt
@@ -100,6 +100,10 @@ 'git merge --abort' is equivalent to 'git reset --merge' when `MERGE_HEAD` is present. +--quit:: + Forget about the current merge in progress. Leave the index + and the working tree as-is. + --continue:: After a 'git merge' stops due to conflicts you can conclude the merge by running 'git merge --continue' (see "HOW TO RESOLVE
diff --git a/git-send-email.html b/git-send-email.html index 9772ceb..6f216b1 100644 --- a/git-send-email.html +++ b/git-send-email.html
@@ -1161,6 +1161,24 @@ <h3 id="_automating">Automating</h3> <div class="dlist"><dl> <dt class="hdlist1"> +--no-[to|cc|bcc] +</dt> +<dd> +<p> + Clears any list of "To:", "Cc:", "Bcc:" addresses previously + set via config. +</p> +</dd> +<dt class="hdlist1"> +--no-identity +</dt> +<dd> +<p> + Clears the previously read value of <code>sendemail.identity</code> set + via config, if any. +</p> +</dd> +<dt class="hdlist1"> --to-cmd=<command> </dt> <dd> @@ -1607,7 +1625,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-02-05 15:33:20 PST + 2019-06-13 15:06:39 PDT </div> </div> </body>
diff --git a/git-send-email.txt b/git-send-email.txt index 1afe9fc..a861934 100644 --- a/git-send-email.txt +++ b/git-send-email.txt
@@ -278,6 +278,14 @@ Automating ~~~~~~~~~~ +--no-[to|cc|bcc]:: + Clears any list of "To:", "Cc:", "Bcc:" addresses previously + set via config. + +--no-identity:: + Clears the previously read value of `sendemail.identity` set + via config, if any. + --to-cmd=<command>:: Specify a command to execute once per patch file which should generate patch file specific "To:" entries.
diff --git a/git-update-server-info.html b/git-update-server-info.html index 16996f8..31f1ce8 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html
@@ -749,7 +749,7 @@ <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<pre class="content"><em>git update-server-info</em> [--force]</pre> +<pre class="content"><em>git update-server-info</em></pre> <div class="attribution"> </div></div> </div> @@ -765,24 +765,6 @@ </div> </div> <div class="sect1"> -<h2 id="_options">OPTIONS</h2> -<div class="sectionbody"> -<div class="dlist"><dl> -<dt class="hdlist1"> --f -</dt> -<dt class="hdlist1"> ---force -</dt> -<dd> -<p> - Update the info files from scratch. -</p> -</dd> -</dl></div> -</div> -</div> -<div class="sect1"> <h2 id="_output">OUTPUT</h2> <div class="sectionbody"> <div class="paragraph"><p>Currently the command updates the following files. Please see @@ -813,7 +795,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2018-01-26 15:11:04 PST + 2019-06-13 15:06:39 PDT </div> </div> </body>
diff --git a/git-update-server-info.txt b/git-update-server-info.txt index bd0e364..969bb2e 100644 --- a/git-update-server-info.txt +++ b/git-update-server-info.txt
@@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] -'git update-server-info' [--force] +'git update-server-info' DESCRIPTION ----------- @@ -19,15 +19,6 @@ what references and packs the server has. This command generates such auxiliary files. - -OPTIONS -------- - --f:: ---force:: - Update the info files from scratch. - - OUTPUT ------
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 9a1617b..132b518 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:20 PDT + 2019-06-13 15:07:27 PDT </div> </div> </body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 9321fa5..eb58d45 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html
@@ -1435,7 +1435,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:20 PDT + 2019-06-13 15:07:27 PDT </div> </div> </body>
diff --git a/howto/new-command.html b/howto/new-command.html index 9b95b53..5e6441b 100644 --- a/howto/new-command.html +++ b/howto/new-command.html
@@ -863,7 +863,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:17 PDT + 2019-06-13 15:07:23 PDT </div> </div> </body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index ce0cac3..f18a722 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:20 PDT + 2019-06-13 15:07:27 PDT </div> </div> </body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 67f93ff..6b8db4a 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:19 PDT + 2019-06-13 15:07:27 PDT </div> </div> </body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 5a4443d..f51c13d 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:19 PDT + 2019-06-13 15:07:26 PDT </div> </div> </body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 717ac9c..d490ec8 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:19 PDT + 2019-06-13 15:07:26 PDT </div> </div> </body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 9b61fb9..b78fe10 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:19 PDT + 2019-06-13 15:07:26 PDT </div> </div> </body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 13d22cd..3b6de60 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:17 PDT + 2019-06-13 15:07:24 PDT </div> </div> </body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index d81da1a..ce7bca4 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:19 PDT + 2019-06-13 15:07:26 PDT </div> </div> </body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 509b277..9bfac07 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:18 PDT + 2019-06-13 15:07:25 PDT </div> </div> </body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index b4622e4..4251f98 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:18 PDT + 2019-06-13 15:07:25 PDT </div> </div> </body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index b5c5057..9ac89d9 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:18 PDT + 2019-06-13 15:07:25 PDT </div> </div> </body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index ddb8dd7..0db85e9 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:17 PDT + 2019-06-13 15:07:24 PDT </div> </div> </body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 76fc939..c5117bf 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2019-06-07 11:58:17 PDT + 2019-06-13 15:07:24 PDT </div> </div> </body>
